From: Andrew Cooper <andrew.cooper3@citrix.com>
Date: Tue, 10 May 2016 13:37:00 +0000 (+0100)
Subject: sched/rt: Fix memory leak in rt_init()
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~1141
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks://%22Dat/%22http:/www.example.com/cgi/%22https:/%22bookmarks:/%22Dat?a=commitdiff_plain;h=fdb9a18698c9ab8e8e8e875f20184b4aa5d62825;p=xen.git

sched/rt: Fix memory leak in rt_init()

c/s 2656bc7b0 "xen: adopt .deinit_pdata and improve timer handling"
introduced a error path into rt_init() which leaked prv if the
allocation of prv->repl_timer failed.

Introduce an error cleanup path.

Spotted by Coverity.

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Reviewed-by: Meng Xu <mengxu@cis.upenn.edu>
Release-acked-by: Wei Liu <wei.liu2@citrix.com>
---
CC: George Dunlap <george.dunlap@eu.citrix.com>
CC: Dario Faggioli <dario.faggioli@citrix.com>
---

diff --git a/xen/common/sched_rt.c b/xen/common/sched_rt.c
index 7f8f411260..aa3ffd20d2 100644
--- a/xen/common/sched_rt.c
+++ b/xen/common/sched_rt.c
@@ -581,6 +581,7 @@ replq_reinsert(const struct scheduler *ops, struct rt_vcpu *svc)
 static int
 rt_init(struct scheduler *ops)
 {
+    int rc = -ENOMEM;
     struct rt_private *prv = xzalloc(struct rt_private);
 
     printk("Initializing RTDS scheduler\n"
@@ -588,11 +589,11 @@ rt_init(struct scheduler *ops)
            "Use at your own risk.\n");
 
     if ( prv == NULL )
-        return -ENOMEM;
+        goto err;
 
     prv->repl_timer = xzalloc(struct timer);
     if ( prv->repl_timer == NULL )
-        return -ENOMEM;
+        goto err;
 
     spin_lock_init(&prv->lock);
     INIT_LIST_HEAD(&prv->sdom);
@@ -603,8 +604,16 @@ rt_init(struct scheduler *ops)
     cpumask_clear(&prv->tickled);
 
     ops->sched_data = prv;
+    rc = 0;
 
-    return 0;
+ err:
+    if ( rc && prv )
+    {
+        xfree(prv->repl_timer);
+        xfree(prv);
+    }
+
+    return rc;
 }
 
 static void